auto merge of #196 : alexcrichton/cargo/linker-and-ar, r=wycats
authorbors <bors@rust-lang.org>
Mon, 14 Jul 2014 18:40:45 +0000 (18:40 +0000)
committerbors <bors@rust-lang.org>
Mon, 14 Jul 2014 18:40:45 +0000 (18:40 +0000)

Trivial merge